Merge remote-tracking branch 'origin/master' into feature/android

diff --cc lisp/files.el
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge